merge r21588 and r21591

SVN-Revision: 21593

diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
index 42ff29e799684fd6aef4063b9adacb2594d4fd95..0886c74c59661d7670c509cc7e4662666b2ae9d0 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -11,7 +11,7 @@ addif() {
 
        # PPP devices are configured by pppd, no need to run setup_interface here
        case "$INTERFACE" in
-               ppp*) return 0;;
+               ppp*|3g-*) return 0;;
                ath*) return 0;;
                wlan*) return 0;;
        esac

diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index d60d41a64e07726011ff529b2bb71a9294465534..9d4904ae4301d14f1dcc38b3bcf5011914c2d560 100755 (executable)
--- a/package/base-files/files/etc/init.d/network
+++ b/package/base-files/files/etc/init.d/network
@@ -23,7 +23,10 @@ boot() {
                local proto
                config_get proto "$ifc" proto
 
-               type "coldplug_interface_$proto" >/dev/null && \
+               local auto
+               config_get_bool auto "$ifc" auto 1
+
+               type "coldplug_interface_$proto" >/dev/null && [ "$auto" = 1 ] && \
                        coldplug_interface_$proto "$ifc"
        done
 }